Auto merge of #4202 - dethoter:issue-4199, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 21 Jun 2017 17:49:38 +0000 (17:49 +0000)
committerbors <bors@rust-lang.org>
Wed, 21 Jun 2017 17:49:38 +0000 (17:49 +0000)
commitaf0edfe6ed9c0cd110cb7e47186543659bb0c2a5
tree36a4bdf6b579b3d96885281bfdee89ba70d2ea16
parent4733e07a895bd9942d32dc6d0f327a9e40875362
parent03a7f0504a5427918aa2cb37e3e9064bae24803e
Auto merge of #4202 - dethoter:issue-4199, r=alexcrichton

Fix an incorrect merge of credentials. Add a new test for that.

Fix for #4199.